From 93169c844fe9024780f04d6bc4448fd3a627ff80 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sun, 8 Jun 2014 04:37:46 +0000 Subject: [PATCH] Add 64-bit types to logging.h. Move gpx to new Fatal scheme. --- gpsbabel/gpx.cc | 13 +++++++------ gpsbabel/logging.h | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc index 2767a482d..feabd47e8 100644 --- a/gpsbabel/gpx.cc +++ b/gpsbabel/gpx.cc @@ -23,6 +23,7 @@ #include "cet_util.h" #include "garmin_fs.h" #include "garmin_tables.h" +#include "logging.h" #include #include static QXmlStreamReader* reader; @@ -1284,11 +1285,10 @@ gpx_read(void) } if (reader->hasError()) { - fatal(MYNAME ":Read error: %s (%s, line %ld, col %ld)\n", - CSTR(reader->errorString()), - CSTR(iqfile->fileName()), - (long) reader->lineNumber(), - (long) reader->columnNumber()); + Fatal() << MYNAME << "Read error:" << reader->errorString() + << "File:" << iqfile->fileName() + << "Line:" << reader->lineNumber() + << "Column:" << reader->columnNumber(); } } @@ -1807,7 +1807,8 @@ gpx_write(void) gpx_wversion_num = strtod(gpx_wversion, NULL) * 10; if (gpx_wversion_num <= 0) { - fatal(MYNAME ": gpx version number of '%s' not valid.\n", gpx_wversion); + Fatal() << MYNAME << ": gpx version number of " + << gpx_wversion << "not valid."; } // FIXME: This write of a blank line is needed for Qt 4.6 (as on Centos 6.3) diff --git a/gpsbabel/logging.h b/gpsbabel/logging.h index 9226a1ca9..c6df94d29 100644 --- a/gpsbabel/logging.h +++ b/gpsbabel/logging.h @@ -46,6 +46,8 @@ class Warning { inline Warning& operator << (unsigned int d) { fileStream_ << d; return optionalSpace(); } inline Warning& operator << (signed long d) { fileStream_ << d; return optionalSpace(); } inline Warning& operator << (unsigned long d) { fileStream_ << d; return optionalSpace(); } + inline Warning& operator << (qint64 d) { fileStream_ << d; return optionalSpace(); } + inline Warning& operator << (quint64 d) { fileStream_ << d; return optionalSpace(); } inline Warning& operator << (float d) { fileStream_ << d; return optionalSpace(); } inline Warning& operator << (double d) { fileStream_ << d; return optionalSpace(); } inline Warning& operator << (const char* d) { fileStream_ << QString::fromUtf8(d); return optionalSpace(); } -- 2.30.2